From: Joakim <joakim@localhost.localdomain>
Date: Wed, 18 Aug 2010 11:11:01 +0000 (+0200)
Subject: merge from trunk, no conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6899^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1279b5e5e8db648800532657074901990e8f541c;p=emacs.git

merge from trunk, no conflicts
---

1279b5e5e8db648800532657074901990e8f541c